some changes to everything