modify all code / function to i prefer