Update Active and Edit