Added some blocks. Cleaned again