changed all type numbers into enum types
Code merge! Yes