Revert "some updates (WHY ON EARTH!)"

This reverts commit d034b9a4595bfdd7a42df1039b2ca874ef357584.