sirius merge, display still need to be fixed