Changed math
Fixed second conflict