Adding some new logic