Improved bounds
Refactoring
Update