moved according to Zubr's idea