fixed server attempt 2