Removed version check until I can figure out grep