some modifications again