Work on filtering out commands