Follow mode improvements