Updated to pass user tests