Updated to make it compatible with the library its replacing