Took away some generic type stuff