adding some suggestions mirion made