updated sub (merge feature1 with master)