made real-time updating better