Changes to the code to make it SS 2.4 Compatible