moved to callback functions + added clapping support