pls extract method L149-158 seem like a dupe for L134-145