removed new types to make the file simpler, I will experiment with those in a Redo library