added logics in
merged