Further work on new awareness system.