made it much nicer, but still very cumbersome