a stable version that should have been a lot of smaller commits