remove redurant variable, add screens