huge update on fixtures