update regarding to Nat's suggestions