Final change to content provider branch