changed the whole situation system