CHANGED: Changes made as per client instructions