More CanDo's

More updates to the CanDo methods