Changed the types so that they are right