Made it much nicer