last update and fix bug