merged changes with Nick's