minor changes
works somehow