Minor changes and design done.