added class, added prob calcs