added the rest of the cases