make valid, add modal popup