before final merge and debug 02