Version 2. Added block class