Added entropy stuff