Removing Sony and adding villec2