Partially updated to 1.7!