Temp fix
Refactor