missing stuff on daeiron commit