added changes from my personal machine