Added delay calcs and combined mac/pc