added more details, and patch