Added step 2, as breaking problem apart