Changes and enhancement for Sprint5
sprint 5 changes and enhancements