some modifications to add to lisibility