Adding the original code