updated for new keystone build