We will improve the implementation of Free SHS