Partial 1.7 update