New libraries and cleaner code