Fixed Exception, adapted code to match new methods.