restructure more into steps