My small modifications