made lots of Akos changes