Still need to fix advencode 3, 4, 7 cases