Modified all Methods, but not finished jet