changes to fit iOS