added functionality -ready for testing in test environment