Commenting and adding interval option