Luke3
Refactor