Factory is no longer needed
Library is now saved no matter which the order is