impprove select environments #42