Working on proper probability calculation