working on better figures