added keytap
merged