simplified more things