added acceltap functionality
fixed merge conflicts