probably just a compromise
merged josh