add wrapper and move login status