Made last commit less hacky