Updated to work with clock shield