wasn't sure ... if you think it's redundant i can remove or combine