Changes to CPLast