last changes from Mike Pall