Modify to include sunlight api