Working version, no indenting