server programming adjusted
merge