second commit, edit bug fixed for now