added the cases and things