another big change because i don't split commits :(