Post save logic fixed with new strcuture.