Few changes for testing