Did a function and some forgotten logic