maltes
committed
on 25 Jan 05
Further changes necessary due to calculations