Reshuffled order of features to be implemented.
Added/moved up correct generation