remaned a filed and a parameter.
added a helper method.