Changed to an independant model for displays