Revisions to add parsed output properly and make selection easier