first change from suggestion
add new sort of working, still nothing on edit