hopefully merged my mess properly this time sigh