merged pintB + A. lot of stuff new