!Important | See last commuit, much much better solution