many changes, improved the structure drastically