Improved init