Remodeling the code and adding some items.