Partially changed the gerpphrase definitions