added some keystone stuff