Kirov and Ekb

Signed-off-by: RuMoHoR <git@rumohor.com>
SPB12

Signed-off-by: RuMoHoR <git@rumohor.com>