Update

Commented out some unnecessary cases