changes from 3d version