Updated code to classy info