did some restructuring deprecated, removed, optimized code... test before push
nested where works awesomely, other changes aswell