Improved Initial commit