added star method
fixed merge
fixing conflict