Finish

Need to modify & fix bug.