Added checking on edit functions, etc...