Improved runtime
Improved runtime