change namespace
add case to clear on button press