ticket:3 logic a bit reworked