Changes in normal mode to make it work as expected