#12: update some changes to accomodate phones