changed to meet requirements