improvement functionality and test app.