updated for Beta 5
added delegate for tap handling