Fixing upstream fork along with added functionality