some modifications in forem