Feature/figures