updated for maclof viewing pleasure