added 2d changes