Changes for hardware setup