Add two more helper functions