added is-touched and is-clicked prepared