refactoring and added rocket