latest changes on normal mode