Made some changes in Åsas code (will revert)
Revert "Made some changes in Åsas code (will revert)"

This reverts commit 5a65f551a98ffd7948c020fc7e88a163dd47f27c.