going forward feature works... but needs more testing