second edit
probably merge didn't work oh well