lots of rearranging to keep from crashing on safari