diff --git a/README.md b/README.md
index 27b9984..af3c402 100644
--- a/README.md
+++ b/README.md
@@ -11,4 +11,6 @@ This mod adds a wine barrel used to ferment grapes into glasses of wine, 9 of wh
 Changelog:
 
 0.1 - Initial release
-0.2 - Added protection checks to barrel
\ No newline at end of file
+0.2 - Added protection checks to barrel
+0.3 - New barrel model from cottages mod (thanks Napiophelios)
+    - Wine glass can be placed
\ No newline at end of file
diff --git a/init.lua b/init.lua
index 3793536..e4d1015 100644
--- a/init.lua
+++ b/init.lua
@@ -1,8 +1,28 @@
--- wine glass
+--[[ wine glass
 minetest.register_craftitem("wine:glass_wine", {
 	description = "Glass of Wine",
 	inventory_image = "wine.png",
 	on_use = minetest.item_eat(2),
+})]]
+
+minetest.register_node("wine:glass_wine", {
+	description = "Glass of Wine",
+	drawtype = "plantlike",
+	visual_scale = 0.8,
+	tiles = {"wine.png"},
+	inventory_image = "wine.png",
+	wield_image = "wine.png",
+	paramtype = "light",
+	is_ground_content = false,
+	sunlight_propagates = true,
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.2, -0.5, -0.2, 0.2, 0.3, 0.2}
+	},
+	groups = {vessel = 1, dig_immediate = 3, attached_node = 1},
+	sounds = default.node_sound_glass_defaults(),
+	on_use = minetest.item_eat(2),
 })
 
 -- bottle of wine
@@ -50,8 +70,12 @@ winebarrel_formspec = "size[8,9]"
 
 minetest.register_node("wine:wine_barrel", {
 	description = "Winebarrel",
-	tiles = {"barrel_side.png", "barrel_side.png", "barrel_side.png^[transformR90",
-		"barrel_side.png^[transformR90", "barrel_bottom.png", "barrel_front.png"},
+--	tiles = {"barrel_side.png", "barrel_side.png", "barrel_side.png^[transformR90",
+--		"barrel_side.png^[transformR90", "barrel_bottom.png", "barrel_front.png"},
+	tiles = {"wine_barrel.png" },
+	drawtype = "mesh",
+	mesh = "wine_barrel.obj",
+	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {choppy = 2, oddly_breakable_by_hand = 1},
 	legacy_facedir_simple = true,
diff --git a/models/LICENSE b/models/LICENSE
new file mode 100644
index 0000000..b7b41c5
--- /dev/null
+++ b/models/LICENSE
@@ -0,0 +1,2 @@
+wine_barrel.obj from cottages mod by Sokomine
+author / license : unknown
\ No newline at end of file
diff --git a/models/wine_barrel.obj b/models/wine_barrel.obj
new file mode 100644
index 0000000..ae22045
--- /dev/null
+++ b/models/wine_barrel.obj
@@ -0,0 +1,453 @@
+# Blender v2.69 (sub 0) OBJ File: 'barrel-closed.blend'
+# www.blender.org
+o Cylinder
+v 0.500001 0.092835 -0.466712
+v -0.500000 0.092835 -0.466712
+v 0.500001 0.264371 -0.395660
+v -0.500000 0.264371 -0.395660
+v 0.500001 0.395660 -0.264371
+v -0.500000 0.395660 -0.264371
+v 0.500001 0.466712 -0.092835
+v -0.500000 0.466713 -0.092835
+v 0.500001 0.466712 0.092835
+v -0.500000 0.466713 0.092835
+v 0.500001 0.395660 0.264371
+v -0.500000 0.395660 0.264371
+v 0.500001 0.264371 0.395660
+v -0.500000 0.264371 0.395660
+v 0.500001 0.092835 0.466712
+v -0.500000 0.092835 0.466712
+v 0.500001 -0.092835 0.466712
+v -0.500000 -0.092835 0.466712
+v 0.500001 -0.264371 0.395660
+v -0.500000 -0.264371 0.395660
+v 0.500001 -0.395660 0.264372
+v -0.500000 -0.395660 0.264371
+v 0.500001 -0.466713 0.092835
+v -0.500000 -0.466712 0.092835
+v 0.500001 -0.466713 -0.092835
+v -0.500000 -0.466712 -0.092835
+v 0.500001 -0.395660 -0.264371
+v -0.500000 -0.395660 -0.264372
+v 0.500001 -0.264371 -0.395660
+v -0.500000 -0.264371 -0.395660
+v 0.500001 -0.092835 -0.466712
+v -0.500000 -0.092835 -0.466713
+v -0.413334 0.095930 -0.482270
+v 0.413335 0.273184 -0.408849
+v 0.413335 0.408849 -0.273184
+v 0.413335 0.482270 -0.095929
+v 0.413335 0.482270 0.095930
+v 0.413335 0.408849 0.273184
+v 0.413334 0.273184 0.408849
+v 0.413334 0.095929 0.482270
+v 0.413334 -0.095930 0.482270
+v 0.413334 -0.273184 0.408849
+v 0.413334 -0.408849 0.273184
+v 0.413334 -0.482270 0.095930
+v 0.413334 -0.482270 -0.095929
+v 0.413334 -0.408849 -0.273184
+v 0.413334 -0.273184 -0.408849
+v 0.413334 -0.095929 -0.482270
+v 0.413335 0.095929 -0.482270
+v -0.413334 0.273184 -0.408849
+v -0.413334 0.408849 -0.273184
+v -0.413334 0.482270 -0.095929
+v -0.413334 0.482270 0.095929
+v -0.413334 0.408849 0.273184
+v -0.413334 0.273184 0.408849
+v -0.413334 0.095930 0.482270
+v -0.413334 -0.095929 0.482270
+v -0.413334 -0.273184 0.408849
+v -0.413334 -0.408849 0.273184
+v -0.413334 -0.482270 0.095929
+v -0.413334 -0.482270 -0.095930
+v -0.413334 -0.408849 -0.273184
+v -0.413334 -0.273184 -0.408849
+v -0.413334 -0.095929 -0.482270
+v -0.114830 0.099128 -0.498352
+v 0.114831 0.282294 -0.422482
+v 0.114831 0.422482 -0.282294
+v 0.114831 0.498352 -0.099128
+v 0.114831 0.498352 0.099128
+v 0.114831 0.422482 0.282294
+v 0.114831 0.282294 0.422482
+v 0.114831 0.099128 0.498352
+v 0.114831 -0.099128 0.498352
+v 0.114831 -0.282294 0.422482
+v 0.114831 -0.422482 0.282294
+v 0.114831 -0.498352 0.099128
+v 0.114831 -0.498352 -0.099128
+v 0.114831 -0.422482 -0.282294
+v 0.114831 -0.282293 -0.422482
+v 0.114831 -0.099128 -0.498352
+v 0.114831 0.099128 -0.498352
+v -0.114830 0.282294 -0.422482
+v -0.114830 0.422482 -0.282294
+v -0.114830 0.498352 -0.099128
+v -0.114830 0.498352 0.099128
+v -0.114830 0.422482 0.282294
+v -0.114830 0.282294 0.422482
+v -0.114830 0.099128 0.498352
+v -0.114830 -0.099128 0.498352
+v -0.114830 -0.282293 0.422482
+v -0.114830 -0.422482 0.282294
+v -0.114830 -0.498352 0.099128
+v -0.114830 -0.498352 -0.099128
+v -0.114830 -0.422482 -0.282294
+v -0.114830 -0.282293 -0.422482
+v -0.114830 -0.099128 -0.498352
+v 0.500001 0.083551 -0.420041
+v -0.500000 0.083552 -0.420041
+v 0.500001 0.237934 -0.356094
+v -0.500000 0.237934 -0.356094
+v 0.500001 0.356094 -0.237934
+v -0.500000 0.356094 -0.237934
+v 0.500001 0.420041 -0.083551
+v -0.500000 0.420041 -0.083551
+v 0.500001 0.420041 0.083552
+v -0.500000 0.420041 0.083551
+v 0.500001 0.356094 0.237934
+v -0.500000 0.356094 0.237934
+v 0.500001 0.237934 0.356094
+v -0.500000 0.237934 0.356094
+v 0.500001 0.083551 0.420041
+v -0.500000 0.083551 0.420041
+v 0.500001 -0.083551 0.420041
+v -0.500000 -0.083551 0.420041
+v 0.500001 -0.237934 0.356094
+v -0.500000 -0.237934 0.356094
+v 0.500001 -0.356094 0.237934
+v -0.500000 -0.356094 0.237934
+v 0.500001 -0.420041 0.083551
+v -0.500000 -0.420041 0.083551
+v 0.500001 -0.420041 -0.083551
+v -0.500000 -0.420041 -0.083552
+v 0.500001 -0.356094 -0.237934
+v -0.500000 -0.356094 -0.237934
+v 0.500001 -0.237934 -0.356094
+v -0.500000 -0.237934 -0.356094
+v 0.500001 -0.083551 -0.420041
+v -0.500000 -0.083551 -0.420041
+v -0.413334 0.086337 -0.434043
+v 0.413335 0.245866 -0.367964
+v 0.413335 0.367964 -0.245866
+v 0.413335 0.434043 -0.086336
+v 0.413335 0.434043 0.086337
+v 0.413335 0.367964 0.245866
+v 0.413335 0.245866 0.367964
+v 0.413334 0.086336 0.434043
+v 0.413334 -0.086337 0.434043
+v 0.413334 -0.245866 0.367964
+v 0.413334 -0.367964 0.245866
+v 0.413334 -0.434043 0.086337
+v 0.413334 -0.434043 -0.086337
+v 0.413334 -0.367964 -0.245866
+v 0.413335 -0.245865 -0.367964
+v 0.413335 -0.086336 -0.434043
+v 0.413335 0.086336 -0.434043
+v -0.413334 0.245866 -0.367964
+v -0.413334 0.367964 -0.245866
+v -0.413334 0.434043 -0.086337
+v -0.413334 0.434043 0.086337
+v -0.413334 0.367964 0.245866
+v -0.413334 0.245866 0.367964
+v -0.413334 0.086337 0.434043
+v -0.413334 -0.086336 0.434043
+v -0.413334 -0.245865 0.367964
+v -0.413334 -0.367964 0.245866
+v -0.413334 -0.434043 0.086337
+v -0.413334 -0.434043 -0.086337
+v -0.413334 -0.367964 -0.245866
+v -0.413334 -0.245865 -0.367964
+v -0.413334 -0.086336 -0.434043
+v -0.428605 0.087776 -0.441280
+v -0.428605 -0.087776 -0.441280
+v -0.428605 -0.249965 -0.374099
+v -0.428605 -0.374099 -0.249965
+v -0.428605 -0.441280 -0.087776
+v -0.428605 -0.441280 0.087776
+v -0.428605 -0.374099 0.249965
+v -0.428605 -0.249965 0.374099
+v -0.428605 -0.087776 0.441280
+v -0.428605 0.087776 0.441280
+v -0.428605 0.249965 0.374099
+v -0.428605 0.374099 0.249965
+v -0.428605 0.441280 0.087776
+v -0.428605 0.441280 -0.087776
+v -0.428605 0.374099 -0.249965
+v -0.428605 0.249965 -0.374099
+v -0.428605 0.000000 -0.000000
+v 0.413334 -0.000000 0.000000
+vt 0.211538 0.442308
+vt 0.211538 0.467949
+vt 0.108974 0.467949
+vt 0.108974 0.442308
+vt 0.314103 0.442308
+vt 0.314103 0.467949
+vt 0.416667 0.442308
+vt 0.416667 0.467949
+vt 0.006410 0.467949
+vt 0.006410 0.442308
+vt 0.211792 0.993590
+vt 0.117562 0.954728
+vt 0.262789 0.738327
+vt 0.211538 0.006410
+vt 0.108974 0.006410
+vt 0.108974 0.032051
+vt 0.211538 0.032051
+vt 0.314103 0.006410
+vt 0.314103 0.032051
+vt 0.416667 0.006410
+vt 0.416667 0.032051
+vt 0.006410 0.006410
+vt 0.006410 0.032051
+vt 0.211361 0.993526
+vt 0.117394 0.954505
+vt 0.262040 0.737637
+vt 0.045447 0.882467
+vt 0.006475 0.788381
+vt 0.006410 0.686569
+vt 0.045263 0.592532
+vt 0.117118 0.520586
+vt 0.204627 0.488094
+vt 0.312719 0.481748
+vt 0.406687 0.520769
+vt 0.478633 0.592807
+vt 0.517605 0.686893
+vt 0.517670 0.788705
+vt 0.478816 0.882742
+vt 0.406962 0.954687
+vt 0.313044 0.993590
+vt 0.045441 0.882922
+vt 0.006410 0.789102
+vt 0.006410 0.687551
+vt 0.045442 0.593732
+vt 0.117562 0.521925
+vt 0.211793 0.483064
+vt 0.313787 0.483064
+vt 0.408016 0.521926
+vt 0.480136 0.593732
+vt 0.519168 0.687551
+vt 0.519168 0.789103
+vt 0.480136 0.882922
+vt 0.408016 0.954728
+vt 0.313786 0.993590
+vt 0.416667 0.397436
+vt 0.314103 0.397436
+vt 0.211538 0.397436
+vt 0.108974 0.397436
+vt 0.006410 0.397436
+vt 0.314103 0.185897
+vt 0.314103 0.282051
+vt 0.211538 0.282051
+vt 0.211538 0.185897
+vt 0.108974 0.282051
+vt 0.108974 0.185897
+vt 0.006410 0.282051
+vt 0.006410 0.185897
+vt 0.416667 0.185897
+vt 0.416667 0.282051
+vt 0.416667 0.076923
+vt 0.314103 0.076923
+vt 0.211538 0.076923
+vt 0.108974 0.076923
+vt 0.006410 0.076923
+vt 0.429487 0.397436
+vt 0.532051 0.397436
+vt 0.532051 0.442308
+vt 0.429487 0.442308
+vt 0.634615 0.397436
+vt 0.634615 0.442308
+vt 0.737179 0.397436
+vt 0.737179 0.442308
+vt 0.839744 0.397436
+vt 0.839744 0.442308
+vt 0.429487 0.032051
+vt 0.532051 0.032051
+vt 0.532051 0.076923
+vt 0.429487 0.076923
+vt 0.634615 0.032051
+vt 0.634615 0.076923
+vt 0.737179 0.032051
+vt 0.737179 0.076923
+vt 0.839744 0.032051
+vt 0.839744 0.076923
+s off
+f 14/1 110/2 112/3 16/4
+f 12/5 108/6 110/2 14/1
+f 10/7 106/8 108/6 12/5
+f 8/4 104/3 106/9 10/10
+f 6/1 102/2 104/3 8/4
+f 4/5 100/6 102/2 6/1
+f 2/7 98/8 100/6 4/5
+f 32/4 128/3 98/9 2/10
+f 30/1 126/2 128/3 32/4
+f 28/5 124/6 126/2 30/1
+f 26/7 122/8 124/6 28/5
+f 24/4 120/3 122/9 26/10
+f 22/1 118/2 120/3 24/4
+f 20/5 116/6 118/2 22/1
+f 18/7 114/8 116/6 20/5
+f 16/4 112/3 114/9 18/10
+f 145/11 130/12 178/13
+f 13/14 15/15 111/16 109/17
+f 11/18 13/14 109/17 107/19
+f 9/20 11/18 107/19 105/21
+f 7/15 9/22 105/23 103/16
+f 5/14 7/15 103/16 101/17
+f 3/18 5/14 101/17 99/19
+f 1/20 3/18 99/19 97/21
+f 31/15 1/22 97/23 127/16
+f 29/14 31/15 127/16 125/17
+f 27/18 29/14 125/17 123/19
+f 25/20 27/18 123/19 121/21
+f 23/15 25/22 121/23 119/16
+f 21/14 23/15 119/16 117/17
+f 19/18 21/14 117/17 115/19
+f 17/20 19/18 115/19 113/21
+f 15/15 17/22 113/23 111/16
+f 162/24 163/25 177/26
+f 163/25 164/27 177/26
+f 164/27 165/28 177/26
+f 165/28 166/29 177/26
+f 166/29 167/30 177/26
+f 167/30 168/31 177/26
+f 168/31 169/32 177/26
+f 169/32 170/33 177/26
+f 170/33 171/34 177/26
+f 171/34 172/35 177/26
+f 172/35 173/36 177/26
+f 173/36 174/37 177/26
+f 174/37 175/38 177/26
+f 175/38 176/39 177/26
+f 176/39 161/40 177/26
+f 161/40 162/24 177/26
+f 130/12 131/41 178/13
+f 131/41 132/42 178/13
+f 132/42 133/43 178/13
+f 133/43 134/44 178/13
+f 134/44 135/45 178/13
+f 135/45 136/46 178/13
+f 136/46 137/47 178/13
+f 137/47 138/48 178/13
+f 138/48 139/49 178/13
+f 139/49 140/50 178/13
+f 140/50 141/51 178/13
+f 141/51 142/52 178/13
+f 142/52 143/53 178/13
+f 143/53 144/54 178/13
+f 144/54 145/11 178/13
+s 1
+f 33/55 2/7 4/5 50/56
+f 50/56 4/5 6/1 51/57
+f 51/57 6/1 8/4 52/58
+f 52/58 8/4 10/10 53/59
+f 53/55 10/7 12/5 54/56
+f 54/56 12/5 14/1 55/57
+f 55/57 14/1 16/4 56/58
+f 56/58 16/4 18/10 57/59
+f 57/55 18/7 20/5 58/56
+f 58/56 20/5 22/1 59/57
+f 59/57 22/1 24/4 60/58
+f 60/58 24/4 26/10 61/59
+f 61/55 26/7 28/5 62/56
+f 62/56 28/5 30/1 63/57
+f 64/58 32/4 2/10 33/59
+f 63/57 30/1 32/4 64/58
+f 66/60 82/61 83/62 67/63
+f 67/63 83/62 84/64 68/65
+f 68/65 84/64 85/66 69/67
+f 69/68 85/69 86/61 70/60
+f 70/60 86/61 87/62 71/63
+f 71/63 87/62 88/64 72/65
+f 72/65 88/64 89/66 73/67
+f 73/68 89/69 90/61 74/60
+f 74/60 90/61 91/62 75/63
+f 75/63 91/62 92/64 76/65
+f 76/65 92/64 93/66 77/67
+f 77/68 93/69 94/61 78/60
+f 78/60 94/61 95/62 79/63
+f 80/65 96/64 65/66 81/67
+f 79/63 95/62 96/64 80/65
+f 65/69 33/55 50/56 82/61
+f 82/61 50/56 51/57 83/62
+f 83/62 51/57 52/58 84/64
+f 84/64 52/58 53/59 85/66
+f 85/69 53/55 54/56 86/61
+f 86/61 54/56 55/57 87/62
+f 87/62 55/57 56/58 88/64
+f 88/64 56/58 57/59 89/66
+f 89/69 57/55 58/56 90/61
+f 90/61 58/56 59/57 91/62
+f 91/62 59/57 60/58 92/64
+f 92/64 60/58 61/59 93/66
+f 93/69 61/55 62/56 94/61
+f 94/61 62/56 63/57 95/62
+f 96/64 64/58 33/59 65/66
+f 95/62 63/57 64/58 96/64
+f 1/21 49/70 34/71 3/19
+f 3/19 34/71 35/72 5/17
+f 5/17 35/72 36/73 7/16
+f 7/16 36/73 37/74 9/23
+f 9/21 37/70 38/71 11/19
+f 11/19 38/71 39/72 13/17
+f 13/17 39/72 40/73 15/16
+f 15/16 40/73 41/74 17/23
+f 17/21 41/70 42/71 19/19
+f 19/19 42/71 43/72 21/17
+f 21/17 43/72 44/73 23/16
+f 23/16 44/73 45/74 25/23
+f 25/21 45/70 46/71 27/19
+f 27/19 46/71 47/72 29/17
+f 31/16 48/73 49/74 1/23
+f 29/17 47/72 48/73 31/16
+f 49/70 81/68 66/60 34/71
+f 34/71 66/60 67/63 35/72
+f 35/72 67/63 68/65 36/73
+f 36/73 68/65 69/67 37/74
+f 37/70 69/68 70/60 38/71
+f 38/71 70/60 71/63 39/72
+f 39/72 71/63 72/65 40/73
+f 40/73 72/65 73/67 41/74
+f 41/70 73/68 74/60 42/71
+f 42/71 74/60 75/63 43/72
+f 43/72 75/63 76/65 44/73
+f 44/73 76/65 77/67 45/74
+f 45/70 77/68 78/60 46/71
+f 46/71 78/60 79/63 47/72
+f 48/73 80/65 81/67 49/74
+f 47/72 79/63 80/65 48/73
+f 65/69 82/61 66/60 81/68
+f 129/75 146/76 100/77 98/78
+f 146/76 147/79 102/80 100/77
+f 147/79 148/81 104/82 102/80
+f 148/81 149/83 106/84 104/82
+f 149/75 150/76 108/77 106/78
+f 150/76 151/79 110/80 108/77
+f 151/79 152/81 112/82 110/80
+f 152/81 153/83 114/84 112/82
+f 153/75 154/76 116/77 114/78
+f 154/76 155/79 118/80 116/77
+f 155/79 156/81 120/82 118/80
+f 156/81 157/83 122/84 120/82
+f 157/75 158/76 124/77 122/78
+f 158/76 159/79 126/80 124/77
+f 160/81 129/83 98/84 128/82
+f 159/79 160/81 128/82 126/80
+f 97/85 99/86 130/87 145/88
+f 99/86 101/89 131/90 130/87
+f 101/89 103/91 132/92 131/90
+f 103/91 105/93 133/94 132/92
+f 105/85 107/86 134/87 133/88
+f 107/86 109/89 135/90 134/87
+f 109/89 111/91 136/92 135/90
+f 111/91 113/93 137/94 136/92
+f 113/85 115/86 138/87 137/88
+f 115/86 117/89 139/90 138/87
+f 117/89 119/91 140/92 139/90
+f 119/91 121/93 141/94 140/92
+f 121/85 123/86 142/87 141/88
+f 123/86 125/89 143/90 142/87
+f 127/91 97/93 145/94 144/92
+f 125/89 127/91 144/92 143/90
diff --git a/screenshot.jpg b/screenshot.jpg
new file mode 100644
index 0000000..0d28bef
Binary files /dev/null and b/screenshot.jpg differ
diff --git a/textures/barrel_bottom.png b/textures/barrel_bottom.png
deleted file mode 100644
index f12e2b0..0000000
Binary files a/textures/barrel_bottom.png and /dev/null differ
diff --git a/textures/barrel_front.png b/textures/barrel_front.png
deleted file mode 100644
index 930185a..0000000
Binary files a/textures/barrel_front.png and /dev/null differ
diff --git a/textures/barrel_side.png b/textures/barrel_side.png
deleted file mode 100644
index bc83bc7..0000000
Binary files a/textures/barrel_side.png and /dev/null differ
diff --git a/textures/bucket_wine.png b/textures/bucket_wine.png
deleted file mode 100644
index 6f6693c..0000000
Binary files a/textures/bucket_wine.png and /dev/null differ
diff --git a/textures/wine_barrel.png b/textures/wine_barrel.png
new file mode 100644
index 0000000..1b9b791
Binary files /dev/null and b/textures/wine_barrel.png differ