make basics work with new server