Began working to add less support to function