ver1_final

1st version is buggy