#47 applied new changes to FP3530T