added locks and screen messages