= updated to work with latest libs