closes #63 update and  works together