Pull Request 2 Dev 1.1

sorry I failed to see a while ago, L73 ~ L84 seem similar to L30 ~ 41, I think it will be better to place this part on a separate method to avoid duplication :bow: