more changes by alex