Getting rid of more unnecessary functions...sorry Ben