Added lap support.