still trying to clean up annoying tangents