Functionality is done according to #649 requirements
Functionality is done according to #649 requirements