Updating with latest changes and Nike example