Working version uncommented && unorganised