this
added more things
added more things_v2