Various updates to delay~ model