updated a few things to accomodate for Undo actions