rework first 2 sections a little