Revert "Changed feature engineering"

This reverts commit 3ec207c60ea242531b1aa7f9d955d841db0dff66.