commit to merge
trying to fix merger
pic.m kinda working but sensitive to zero mode elimination