Made some changes, nothing works yet