changed base stuff