few hw changes