Code modifications