working version of the restyling