Further optimize