before final merge and debug 04