LSN Fix pocket mode and lot of improvements 1 of 2