Some tweak for the codes