some edits trying to give it a shape - pass 1