Reverted danny's changes; class seems to be broken