fixed to include figures