updated all figure constructors