Removed duplicate calls.
Some updates.