Fixed bug
Add Remain Function