Refactor anchor to be simpler