cleaned up, added display array