change the code to nico's version
whatever