More work done in Light Table