added ability to change timeframes and apr