Issues #16 and #72

we want to preserve the previous requires