Updates and test commit from new mbp