merging refactor: so i can use from console