Updated code and included badges