UPD: based on kodimon changes