readd blocks and fix indendation