Finalizing the rest of the features