Modified to work with no phasing and calculate