restructured things a bit