Workshop overrides, cleanup for better 2D