WIP: some edits
WIP: remove dwn/up samplings