Cleaned up
Bounds support