Added selection and realtime updating