Several circle & pipe calculations added