added base stuff