Feature/tw 22 react to status changes