my final code additions