Edited files to function properly