updated to fix screen issues