Got rid of magic number + lag