Edited the 'typ' parameter for both functions