[ADD] Better perfomance