Added ability to select period range