Updating for better version management (hopefully)