bunch of changes july 22