Issue #118, edit my work