Final version, set up for laptop testing