Changes made minus the poster data
Resolving merge conflict