Reverted back due to method issues

Revert class back to original state due to scope method problems.