A few modifications to consider