Reverting horrible attempt at data inclusion