more changes from atomz