added further changes to keyword reorganisation