whoops. We should make this backward compatible.