minor changes
method improved