Added the last two functions