reverting to the old code as the latest modification was making same entries multiple...