Updated to fit to screen