Updated guard and listen