Minor changes to the last one