Topic/fix requirements