Now using module, made for cleaner, easier use