firt try at a 1.6 update