More hardware changes