Refactoring all to present