updated for 10.5