Final dev updated