removed non base stuff