Made changes to use own library methods.