fixes - step 1