rebuilt with jlord added!