Changed for Art and general tidy up