Updating first version of complete system implementation