Eliminated a race condition. Now supports simple saving