some change on code, debug