Changed organization slightly