working on both machines!