Added some new blocks, made code a little neater