v10 ex2 - refactored fo