some changes, + flash