Removed some unnecessary processing ...