1.6 update

can't test it tough, cause my run configurations are flucked up.