Added new changes to feature branch code