Continuing re-design. hitmap_change_for has been done already.