main now looks much nicer