Changed updates to find+save to use validation