Updating some logic for simplicity and updating readme.