new version with improved dynamics