update to work with latest packages