Updated functional blocs