Modify to deal with fingers