Working on switching blocks properly