Improvements, thanks trap