Add some revised constructions.. don't trust the heavy-logged part.