Decided to use NS instead, fixing some func calls