aykut's commit