Update and rename Empty to Empty 2