Split to 2 methods