Implementation of Issues #201 #211 #212