Added data, deleted old functions