Several code changes (real time updates)