Edited a little more