shuffled stuff around, added 2 new keywords