again some modifications