merge previous version of lightbit