Better normal mode functionality