conflict fix

conflict fix, using andys src code manually copied to my repo