Testing: added in a part of the original code