Removed command -v's since they are slow