Jbahillo/reboot upgrade