Small update + removed some code shenanigans