Grabbed from Sentora GitHub

grabbed updated code from sentora github