Updated for new dev machine