Commented methods and changed cons (untested)