Implmented proper mc logic