Replaced demo lib with original lib