Updated all files so they would compile