Added options to the functions.