Implemented new batch of changes