Ugh, re-added necessary start/end registering