Now I have a complete understanding. Let me create the updated version with all the requested features: