Removing all hardcoded ms and replacing with filter