using yaml for computer-map
all changes made for comments on PR