Base commit with Izubr's code