Updated - Tinker's - Closes #22