Updated with reset + bug fixes