Changed to avoid use of block tags