Removed the set(NO_TYPE) thing