finished edditing up to framework (included)