Fixed 3c and added 3d