Taken old comment out
New architecture done