Adding some sweet functionality