sigh, hacky code additions