cleadned up name changes, made step method more effecient