initial code commit
bug correction