I hope this works. Please.
changed views, possible merge conflict stuff