Boss Code merged