reverting some non-working changes