merging latest changes from Luke