removed swagger and make fcharge more robust