Implementation of Issues #176 #178 #188