redid DP formula + some other shit