Finished conversion to FD macro