Reverted commit 036d3d3 to 367df58 since they dont belong to this branch