small modifications, not important