was edited 4-10-13 to fix problems