added new class
changed blocked not blocked class
Merge remote-tracking branch 'origin/master'