finished code structure change