More work on 1.7 update.