First Version Complete changes