Adjustments to not break in iPhone