First refactor of get