The goal was to not do this anymore? Does this have to be here?