#0.18 modify functions