Code refactoring, more functionality, merged into one file etc.