add RxJS withLatestFrom(); convert to new layout