before some modifications