updated for move to linux