Working on 1.7.2 port