display logic is working a little better now