Start of a 1.7.10 port