Library optimized part 2.

- Contact needs to be fixed