Adding some funcinality