Added small but important changes