updated with fixtures