remove redundant variable, add screens