Adding screen almost ready