v1.7 reworks