Updated fixtures, added if statement to Capcity data