updated for 10.5/6