minor update
minor bug fix
adjust logic
minor update