Added some old code back