updated to allow editing