refactoring code. removed Supporting Feature