Several changes by MF and AL