Add changes from DR Macbook