modification to work with cselabs