Updated file for more modern syntax