Created class and support function for 2.2