Updated Helper, refactoring behaviors