Merged with PBSLjohn-version and my version