Updated functionality and wiring