mod 2
more stuff added