some changes to create a real server