Got rid of extra function.