Improvements and update to 1.5