Merged with Chris. Added ctype.