Modified to act differently on different machines