small modifications, do not mind