dfix working, needs testing