Cleaned Code pulled from recent develop