fixed up the situation logic, starting on frontend