Revert Async to Sync, Add TP disabler