Dev update with NP fix