Adding libraries back in