Finished modifying application helpers