Calculates only needed Objects
Minor changes to Test patch