Added existing code from office PC