Last commit of refactor