merged Luqmaan's changes