modified to use android support v7