merged code from main code computer