Fixed factory conflicts
Moved some functions to make more sense
New line