changed stuff and added things!!!