1.7 Update (not tested :D)