fixing up guard to be compatible and have start, stop and listen