Improve last step design