Changes made to original code