Fixed bug, removed missing method calls