Add another optimization