Update 1.8

UNDER CONSTRUCTION