Updated for GigE