hand-merge with alt. computer

-ssia