Added @djquan changes