Edited two files for testing