My changes to fit my style