fixed stuff from new convention