moving and changing code arround