Added tapall, updated Formula