Changed frequency to interval in all the resources
Changed the source according to CR-3
Changes according to CR-4