Updated code and versioning