Uh... not sure what is happening
Add refactored stuff