CTP Addition + Bugfix