upload integrated version

improved user experience based on Prof's comments