diff --git a/Makefile b/Makefile
index 77684b902..ce3ffc588 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,7 @@
 #                is connected.
 # FUSES ........ Parameters for avrdude to flash the fuses appropriately.
 
+#To compile for Arduino Mega 2560 R3 change atmega328p for atmega2560
 DEVICE     ?= atmega328p
 CLOCK      = 16000000
 PROGRAMMER ?= -c avrisp2 -P usb
diff --git a/config.h b/config.h
index 6fa9e88f6..1e6122e75 100644
--- a/config.h
+++ b/config.h
@@ -43,6 +43,7 @@
 
 // Default cpu mappings. Grbl officially supports the Arduino Uno only. Other processor types
 // may exist from user-supplied templates or directly user-defined in cpu_map.h
+// To compile for Arduino Mega 2560 change CPU_MAP_ATMEGA2560_HORUS
 #define CPU_MAP_ATMEGA328P_HORUS // Arduino Uno CPU for Horus Project
 
 // Define runtime command special characters. These characters are 'picked-off' directly from the
diff --git a/cpu_map.h b/cpu_map.h
index 2206a3193..4f76e37e7 100644
--- a/cpu_map.h
+++ b/cpu_map.h
@@ -189,35 +189,32 @@
 
 //----------------------------------------------------------------------------------------
 
-#ifdef CPU_MAP_ATMEGA2560 // (Arduino Mega 2560) Working @EliteEng
+#ifdef CPU_MAP_ATMEGA2560_HORUS // (Arduino Mega 2560) Working @EliteEng(McVillano version for BQ Ciclop)
 
   // Serial port pins
   #define SERIAL_RX USART0_RX_vect
   #define SERIAL_UDRE USART0_UDRE_vect
-
-  // Increase Buffers to make use of extra SRAM
-  //#define RX_BUFFER_SIZE		256
-  //#define TX_BUFFER_SIZE		128
-  //#define BLOCK_BUFFER_SIZE	36
-  //#define LINE_BUFFER_SIZE	100
-
-  // Define step pulse output pins. NOTE: All step bit pins must be on the same port.
+  
+  // Define laser pulse output pins. NOTE: All laser pins must be on the same port.
+  #define LASER_DDR	DDRC
+  #define LASER_PORT	PORTC
+  #define LASER1_BIT	6 	// MEGA2560 Digital pin 31
+  #define LASER2_BIT  7 	// MEGA2560 Digital pin 30
+  #define LASER3_BIT  0   //Just to avoid error compilating
+  #define LASER4_BIT  2	  //Just to avoid error compilating
+  #define LASER_MASK  ((1<<LASER1_BIT)|(1<<LASER2_BIT)|(1<<LASER3_BIT)|(1<<LASER4_BIT))
+
+  // Define step pulse output pins. NOTE: Al step bit pins must be on the same port.
   #define STEP_DDR      DDRA
   #define STEP_PORT     PORTA
-  #define STEP_PIN      PINA
-  #define X_STEP_BIT        2 // MEGA2560 Digital Pin 24
-  #define Y_STEP_BIT        3 // MEGA2560 Digital Pin 25
-  #define Z_STEP_BIT        4 // MEGA2560 Digital Pin 26
-  #define STEP_MASK ((1<<X_STEP_BIT)|(1<<Y_STEP_BIT)|(1<<Z_STEP_BIT)) // All step bits
+  #define X_STEP_BIT	  2 	// MEGA2560 Digital Pin 24
+  #define STEP_MASK 	 (1<<X_STEP_BIT) // All step bits
 
   // Define step direction output pins. NOTE: All direction pins must be on the same port.
   #define DIRECTION_DDR      DDRA
   #define DIRECTION_PORT     PORTA
-  #define DIRECTION_PIN      PINA
-  #define X_DIRECTION_BIT   5 // MEGA2560 Digital Pin 27
-  #define Y_DIRECTION_BIT   6 // MEGA2560 Digital Pin 28
-  #define Z_DIRECTION_BIT   7 // MEGA2560 Digital Pin 29
-  #define DIRECTION_MASK ((1<<X_DIRECTION_BIT)|(1<<Y_DIRECTION_BIT)|(1<<Z_DIRECTION_BIT)) // All direction bits
+  #define X_DIRECTION_BIT    5 // MEGA2560 Digital Pin 27
+  #define DIRECTION_MASK 	  (1<<X_DIRECTION_BIT) // All direction bits
 
   // Define stepper driver enable/disable output pin.
   #define STEPPERS_DISABLE_DDR   DDRB
@@ -225,77 +222,13 @@
   #define STEPPERS_DISABLE_BIT   7 // MEGA2560 Digital Pin 13
   #define STEPPERS_DISABLE_MASK (1<<STEPPERS_DISABLE_BIT)
 
-  // NOTE: All limit bit pins must be on the same port
-  #define LIMIT_DDR       DDRB
-  #define LIMIT_PORT      PORTB
-  #define LIMIT_PIN       PINB
-  #define X_LIMIT_BIT     4 // MEGA2560 Digital Pin 10
-  #define Y_LIMIT_BIT     5 // MEGA2560 Digital Pin 11
-  #define Z_LIMIT_BIT     6 // MEGA2560 Digital Pin 12
-  #define LIMIT_INT       PCIE0  // Pin change interrupt enable pin
-  #define LIMIT_INT_vect  PCINT0_vect 
-  #define LIMIT_PCMSK     PCMSK0 // Pin change interrupt register
-  #define LIMIT_MASK ((1<<X_LIMIT_BIT)|(1<<Y_LIMIT_BIT)|(1<<Z_LIMIT_BIT)) // All limit bits
-
-  // Define spindle enable and spindle direction output pins.
-  #define SPINDLE_ENABLE_DDR   DDRH
-  #define SPINDLE_ENABLE_PORT  PORTH
-  #define SPINDLE_ENABLE_BIT   3 // MEGA2560 Digital Pin 6
-  #define SPINDLE_DIRECTION_DDR   DDRE
-  #define SPINDLE_DIRECTION_PORT  PORTE
-  #define SPINDLE_DIRECTION_BIT   3 // MEGA2560 Digital Pin 5
-
-  // Define flood and mist coolant enable output pins.
-  // NOTE: Uno analog pins 4 and 5 are reserved for an i2c interface, and may be installed at
-  // a later date if flash and memory space allows.
-  #define COOLANT_FLOOD_DDR   DDRH
-  #define COOLANT_FLOOD_PORT  PORTH
-  #define COOLANT_FLOOD_BIT   5 // MEGA2560 Digital Pin 8
-  #ifdef ENABLE_M7 // Mist coolant disabled by default. See config.h to enable/disable.
-    #define COOLANT_MIST_DDR   DDRH
-    #define COOLANT_MIST_PORT  PORTH
-    #define COOLANT_MIST_BIT   6 // MEGA2560 Digital Pin 9
-  #endif  
-
-  // Define user-control pinouts (cycle start, reset, feed hold) input pins.
-  // NOTE: All pinouts pins must be on the same port and not on a port with other input pins (limits).
-  #define PINOUT_DDR       DDRK
-  #define PINOUT_PIN       PINK
-  #define PINOUT_PORT      PORTK
-  #define PIN_RESET        0  // MEGA2560 Analog Pin 8
-  #define PIN_FEED_HOLD    1  // MEGA2560 Analog Pin 9
-  #define PIN_CYCLE_START  2  // MEGA2560 Analog Pin 10
-  #define PINOUT_INT       PCIE2  // Pin change interrupt enable pin
-  #define PINOUT_INT_vect  PCINT2_vect
-  #define PINOUT_PCMSK     PCMSK2 // Pin change interrupt register
-  #define PINOUT_MASK ((1<<PIN_RESET)|(1<<PIN_FEED_HOLD)|(1<<PIN_CYCLE_START))
-
   // Define probe switch input pin.
   #define PROBE_DDR       DDRK
-  #define PROBE_PIN       PINK
   #define PROBE_PORT      PORTK
+  #define PROBE_PIN	      PINK
   #define PROBE_BIT       3  // MEGA2560 Analog Pin 11
   #define PROBE_MASK      (1<<PROBE_BIT)
 
-  // Start of PWM & Stepper Enabled Spindle
-  #ifdef VARIABLE_SPINDLE
-    // Advanced Configuration Below You should not need to touch these variables
-    // Set Timer up to use TIMER2B which is attached to Digital Pin 9
-    #define TCCRA_REGISTER		TCCR2A
-    #define TCCRB_REGISTER		TCCR2B
-    #define OCR_REGISTER		OCR2B
-
-    #define COMB_BIT			COM2B1
-    #define WAVE0_REGISTER		WGM20
-    #define WAVE1_REGISTER		WGM21
-    #define WAVE2_REGISTER		WGM22
-    #define WAVE3_REGISTER		WGM23
-
-    #define SPINDLE_PWM_DDR		DDRH
-    #define SPINDLE_PWM_PORT    PORTH
-    #define SPINDLE_PWM_BIT		6 // MEGA2560 Digital Pin 9
-  #endif // End of VARIABLE_SPINDLE
-
 #endif
 
 //----------------------------------------------------------------------------------------