changed to work with other library