changed orders, better code overview