Commented all remaining methods