Added some enhancements to feature 1