maccam912 updated versions to make it compile again