Merge with LoganCSC Version