changes and enhancement 27-11-2014