More features
Much cleaner