added guessing functionality
merged changes