Rewrote declarations again