Updated with blocs