fixed stuff
fixed use case
ok, refactored