commiting all due to server problems