Update advancecomp and code formating