Source updated to 1.7