Added pic, switched to hardware implementation