New api Some stuff removed(Temp)