I've updated it like described. Let me know what you think.