Rolled back some of the Island things so it works