How to fix CTD's

Now we are getting closer. From:

To: