Hopefully final pdates and changes