updating from @yjacolin commits