Modified to conform to new headers