Add logic for level 61+. Close #1