Lag support added and tested live