better naming and fixed problem with grass