Boujamaa's second commit