renamed and small refactor