added level 3
fixing merge conflics