lot of stuff added/changed