this also triggers the event, so it also needs the next two changes below..