Refactor + adapt cmd 15