Sneja's commit