Adding some extra functions