added more base stuff