few improvement after tests