main callback fix in progress