Tweaking things
WIP CTD fixing