updated to latest, tcki's modules