Made the requested changed #55