Updated for iphone overflow