Many changes. This now works as intented! :)