updated with gottaliv files