Got rid of return