changed setup, made things nicer