updated for 10.10 beta