Added Comments and Changed to Widget