included all the cases.

dont want to overlap ur code, therefore create a new one