[TASK] Furter changes according to OZK wishes