Re-edited for fabcy