Checking in some modifications