diff --git a/server/AyaNova/Controllers/WorkOrderController.cs b/server/AyaNova/Controllers/WorkOrderController.cs
index 9d47860f..c4786a90 100644
--- a/server/AyaNova/Controllers/WorkOrderController.cs
+++ b/server/AyaNova/Controllers/WorkOrderController.cs
@@ -168,41 +168,22 @@ namespace AyaNova.Api.Controllers
         [HttpPut("{id}")]
         public async Task<IActionResult> PutWorkOrder([FromRoute] long id, [FromBody] WorkOrder updatedObject)
         {
-            return StatusCode(501);
             if (!serverState.IsOpen)
                 return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
-
             if (!ModelState.IsValid)
                 return BadRequest(new ApiErrorResponse(ModelState));
-
-            //Instantiate the business object handler       
             WorkOrderBiz biz = WorkOrderBiz.GetBiz(ct, HttpContext);
-
             if (!Authorized.HasModifyRole(HttpContext.Items, biz.BizType))
                 return StatusCode(403, new ApiNotAuthorizedResponse());
-
             var o = await biz.PutAsync(id, updatedObject);
             if (o == null)
-                return BadRequest(new ApiErrorResponse(biz.Errors));
-                
+            {
+                if (biz.Errors.Exists(m => m.Code == ApiErrorCode.CONCURRENCY_CONFLICT))
+                    return StatusCode(409, new ApiErrorResponse(biz.Errors));
+                else
+                    return BadRequest(new ApiErrorResponse(biz.Errors));
+            }
             return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
-
-            //todo: handle concurrency in biz object, what to do?
-
-            // var o = await biz.PutAsync(id, updatedObject);
-            // try
-            // {
-            //     if (o == null)
-            //         return BadRequest(new ApiErrorResponse(biz.Errors));
-            // }
-            // catch (DbUpdateConcurrencyException)
-            // {
-            //     if (!await biz.ExistsAsync(id))
-            //         return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
-            //     else
-            //         return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
-            // }
-            // return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
         }