removed unneeded boolean