Final Fix for Part I