Less hacky