make it compatible with manifest_version 2