editing looking much nicer