Updated elbow drawer with explicit transformations