working on test server
cleaned