Updated with supportfragment and patches