updated with refocus on tech and minor changes