Deleted old code and trying out feature combinations