Some improvement