Smart libraries + MANY CHANGES