initial changes

Thanks for zwliew for great job!