New libs + changes