Adding some features of beer's example
Bugs resolve