changes to work on 6.16