refactoring and changing some binds