new fx method complete
Merge branch 'fx'