Back to the old form, aesthetically only