amended registration as discussed

also added more types.