Ver2

cleaner version 2