gotta fix some stuffs