diff --git a/flight/Bootloaders/OpenPilot/main.c b/flight/Bootloaders/OpenPilot/main.c
index 40deeac52..d2d831ef8 100644
--- a/flight/Bootloaders/OpenPilot/main.c
+++ b/flight/Bootloaders/OpenPilot/main.c
@@ -32,9 +32,11 @@ typedef void (*pFunction)(void);
 pFunction Jump_To_Application;
 uint32_t JumpAddress;
 
-uint32_t cnt;
-uint32_t pwm_period;
-uint32_t pwm_sweep_steps;
+/// LEDs PWM
+uint32_t period1 = 50; // *100 uS -> 5 mS
+uint32_t sweep_steps1 = 100; // * 5 mS -> 500 mS
+uint32_t period2 = 50; // *100 uS -> 5 mS
+uint32_t sweep_steps2 = 100; // * 5 mS -> 500 mS
 
 /* Extern variables ----------------------------------------------------------*/
 uint8_t DeviceState;
@@ -42,6 +44,7 @@ uint8_t JumpToApp = 0;
 /* Private function prototypes -----------------------------------------------*/
 void Delay(__IO uint32_t nCount);
 void DelayWithDown(__IO uint32_t nCount);
+uint32_t LedPWM(uint32_t pwm_period, uint32_t pwm_sweep_steps, uint32_t count);
 /* Private functions ---------------------------------------------------------*/
 
 /*******************************************************************************
@@ -54,37 +57,76 @@ void DelayWithDown(__IO uint32_t nCount);
 int main(void) {
 
 	Set_System();
-	if (BSL_HOLD_STATE==0) {
+	if (BSL_HOLD_STATE == 0) {
 
 		USB_Interrupts_Config();
 		Set_USBClock();
 		USB_Init();
 		DeviceState = idle;
 		STOPWATCH_Init(100);
-	}
-	else
+	} else
 		JumpToApp = TRUE;
 	STOPWATCH_Reset();
 
 	while (JumpToApp == 0) {
 
-		cnt = STOPWATCH_ValueGet(); // the reference counter (incremented each 100 uS)
-		pwm_period = 50; // *100 uS -> 5 mS
-		pwm_sweep_steps =100; // * 5 mS -> 500 mS
-		uint32_t pwm_duty = ((cnt / pwm_period) % pwm_sweep_steps)
-				/ (pwm_sweep_steps / pwm_period);
-		if ((cnt % (2 * pwm_period * pwm_sweep_steps)) > pwm_period
-				* pwm_sweep_steps)
-			pwm_duty = pwm_period - pwm_duty; // negative direction each 50*100 ticks
-		uint32_t led_on = ((cnt % pwm_period) > pwm_duty) ? 1 : 0;
-		if(led_on==0)
+		//pwm_period = 50; // *100 uS -> 5 mS
+		//pwm_sweep_steps =100; // * 5 mS -> 500 mS
+
+		switch (DeviceState) {
+		case Last_operation_Success:
+		case uploadingStarting:
+		case DFUidle:
+			period1 = 50;
+			sweep_steps1 = 100;
+			STM_EVAL_LEDOff(LED2);
+			period2 = 0;
+			break;
+		case uploading:
+			period1 = 50;
+			sweep_steps1 = 100;
+			period2 = 25;
+			sweep_steps2 = 50;
+			break;
+		case downloading:
+			period1 = 25;
+			sweep_steps1 = 50;
+			STM_EVAL_LEDOff(LED2);
+			period2 = 0;
+			break;
+		case idle:
+			period1 = 0;
 			STM_EVAL_LEDOn(LED1);
-		else
-			STM_EVAL_LEDOff(LED1);
-		if(STOPWATCH_ValueGet()>100*pwm_period*pwm_sweep_steps)
+			period2=0;
+			break;
+		default://error
+			period1 = 50;
+			sweep_steps1 = 100;
+			period2 = 50;
+			sweep_steps2 = 100;
+		}
+
+		if (period1 != 0) {
+			if (LedPWM(period1, sweep_steps1, STOPWATCH_ValueGet()))
+				STM_EVAL_LEDOn(LED1);
+			else
+				STM_EVAL_LEDOff(LED1);
+		} else
+			STM_EVAL_LEDOn(LED1);
+
+		if (period2 != 0) {
+			if (LedPWM(period2, sweep_steps2, STOPWATCH_ValueGet()))
+				STM_EVAL_LEDOn(LED2);
+			else
+				STM_EVAL_LEDOff(LED2);
+		} else
+			STM_EVAL_LEDOff(LED2);
+
+		if (STOPWATCH_ValueGet() > 100 * 50 * 100)
 			STOPWATCH_Reset();
-		if(STOPWATCH_ValueGet()>50000 && DeviceState == idle)
-			JumpToApp=TRUE;
+		if ((STOPWATCH_ValueGet() > 60000) && (DeviceState == idle))
+			JumpToApp = TRUE;
+		FLASH_Download();
 		//DelayWithDown(10);//1000000);
 	}
 	if (((*(__IO uint32_t*) StartOfUserCode) & 0x2FFE0000) == 0x20000000) { /* Jump to user application */
@@ -104,12 +146,27 @@ int main(void) {
 	}
 
 	while (1) {
-		STM_EVAL_LEDToggle(LED1);
-		STM_EVAL_LEDToggle(LED2);
-		Delay(1000000);
+		if (LedPWM(50, 100, STOPWATCH_ValueGet())) {
+			STM_EVAL_LEDOn(LED2);
+			STM_EVAL_LEDOff(LED1);
+		} else {
+			STM_EVAL_LEDOn(LED1);
+			STM_EVAL_LEDOff(LED2);
+		}
+		if (STOPWATCH_ValueGet() > 2*50 * 100)
+			STOPWATCH_Reset();
+		FLASH_Download();
 	}
-}
 
+}
+uint32_t LedPWM(uint32_t pwm_period, uint32_t pwm_sweep_steps, uint32_t count) {
+	uint32_t pwm_duty = ((count / pwm_period) % pwm_sweep_steps)
+			/ (pwm_sweep_steps / pwm_period);
+	if ((count % (2 * pwm_period * pwm_sweep_steps)) > pwm_period
+			* pwm_sweep_steps)
+		pwm_duty = pwm_period - pwm_duty; // negative direction each 50*100 ticks
+	return ((count % pwm_period) > pwm_duty) ? 1 : 0;
+}
 /*******************************************************************************
  * Function Name  : Delay
  * Description    : Inserts a delay time.
diff --git a/flight/Bootloaders/OpenPilot/usb_endp.c b/flight/Bootloaders/OpenPilot/usb_endp.c
index 4cd88e9ce..c19ea8b46 100644
--- a/flight/Bootloaders/OpenPilot/usb_endp.c
+++ b/flight/Bootloaders/OpenPilot/usb_endp.c
@@ -52,7 +52,7 @@ uint32_t aux;
 volatile uint32_t downPacketCurrent=0;
 uint32_t downPacketTotal=0;
 uint8_t downType=0;
-
+uint32_t downSizeOfLastPacket=0;
 uint32_t MemLocations[3]=
 {
 		StartOfUserCode, StartOfUserCode-SizeOfHash, StartOfUserCode-SizeOfHash-SizeOfDescription
@@ -67,22 +67,34 @@ uint8_t *FLASH_If_Read (uint32_t SectorAddress, uint32_t DataLength)
   return  (uint8_t*)(SectorAddress);
 }
 void FLASH_Download() {
-	if (DeviceState == downloading) {
+	if ((DeviceState == downloading) && (GetEPTxStatus(ENDP1)==EP_TX_NAK)) {
+		uint8_t packetSize;
 		Buffer[0] = 0x01;
 		Buffer[1] = Download;
 		Buffer[2] = downPacketCurrent >> 24;
 		Buffer[3] = downPacketCurrent >> 16;
 		Buffer[4] = downPacketCurrent >> 8;
 		Buffer[5] = downPacketCurrent;
-		Buffer[6] = *FLASH_If_Read(MemLocations[downType]+downPacketCurrent*4, 0);
-		Buffer[7] = *FLASH_If_Read(MemLocations[downType] + 1+downPacketCurrent*4, 0);
-		Buffer[8] = *FLASH_If_Read(MemLocations[downType] + 2+downPacketCurrent*4, 0);
-		Buffer[9] = *FLASH_If_Read(MemLocations[downType] + 3+downPacketCurrent*4, 0);
+		if(downPacketCurrent==downPacketTotal)
+		{
+			packetSize=downSizeOfLastPacket;
+		}
+		else
+		{
+			packetSize=14;
+		}
+		for(int x=0;x<packetSize;++x)
+		{
+		Buffer[6+x*4] = *FLASH_If_Read(MemLocations[downType]+  downPacketCurrent*4+x*4, 0);
+		Buffer[7+x*4] = *FLASH_If_Read(MemLocations[downType] + 1+downPacketCurrent*4+x*4, 0);
+		Buffer[8+x*4] = *FLASH_If_Read(MemLocations[downType] + 2+downPacketCurrent*4+x*4, 0);
+		Buffer[9+x*4] = *FLASH_If_Read(MemLocations[downType] + 3+downPacketCurrent*4+x*4, 0);
+		}
 		USB_SIL_Write(EP1_IN, (uint8_t*) Buffer, 64);
 		downPacketCurrent=downPacketCurrent+1;
 		if(downPacketCurrent>downPacketTotal)
 		{
-			 STM_EVAL_LEDOn(LED2);
+			// STM_EVAL_LEDOn(LED2);
 			DeviceState=Last_operation_Success;
 			Aditionals=(uint32_t)Download;
 		}
@@ -103,7 +115,6 @@ void EP1_OUT_Callback(void)
 
   /* Read received data (2 bytes) */
   USB_SIL_Read(EP1_OUT, Receive_Buffer);
-
   Command=Receive_Buffer[1];
   EchoReqFlag=(Command>>7);
   EchoAnsFlag=(Command>>6) & 0x01;
@@ -225,6 +236,7 @@ void EP1_OUT_Callback(void)
 			 downPacketCurrent=0;
 			 downPacketTotal=Count;
 			 DeviceState=downloading;
+			 downSizeOfLastPacket=Data1;
 		 }
 		 else
 		 {