Introduced few changes