Added suggestions by Sorour Slimane