Add disable delay and proper local name