New riverfront plan due soon