more testing/fixing