Completed changes - maybe errors though