Implemented final 2D UID version