Changes

Changed some things around