updated with latest version from uw pce org