simplified more stuff