update files to use light class functions