Cleaned up multistep