some logic changes, thb seems to work

"seems"