Fix spacing
Change 'source' and make attributes updatable