#1402 Implemented changes required