Added few mores cases to handle