added H5 functionality, I think...