changes all around
previous commit shoudl of stated also added toroplus to the mix