updated some keynames and structure