Incorporated pgxtra suggestions.