Added some extra functions