eliminated error and warnings