Adding time frame selection - to be tested after sherif fix