(1): Improvement requests

Complete and Continue