Forgot to concat and some comments left