New and improved decorator