Fixed method names, added simple shape