This class should not be in the repo
fixed compiling-errors and fixed caused problems