removed extra logic for dereferencing.