more code i guess i overwrote from the merge