//faned added to source modifications