Refactor/overlay