updated library with L2, block and subblock declarations