one more revision made in class ;)