before final merge and debug 01