Revise screen mechanic just to make things more straightforward