Modify to meet specs