Fixed the explicity type bug.
Update to NruJaC's version
add my parts