WORKINGS ON IT
Update to 1.7