Refactored the other methods to use render