Started updating code to current version