Hacks to get it going on 3+

As well as a fun little circle feature I added.