reverted to 2D to merge with master (currently testing that no functionality was lost)