reduced the steps, with better setup