Changed structure; Added j and k mappings