modify the server side dashboard
merge again
logging session work