Separated out the two mode of visualization into separate files