- Changed the import to a library to be more flexible